Merge ppc64el build (bss) fixes from emacs-25
authorRob Browning <rlb@defaultvalue.org>
Mon, 18 Jan 2016 21:20:51 +0000 (15:20 -0600)
committerRob Browning <rlb@defaultvalue.org>
Mon, 18 Jan 2016 23:49:37 +0000 (17:49 -0600)

Trivial merge